Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 21 Oct 2005 11:07:14 +0000 (12:07 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 21 Oct 2005 11:07:14 +0000 (12:07 +0100)

Trivial merge